From 611f2ce85f3aba2d8e532195041260539d7951cf Mon Sep 17 00:00:00 2001 From: robertl Date: Fri, 10 Nov 2006 01:26:21 +0000 Subject: [PATCH] Move the MSVC7 project files into their own. Otherwise, MSVC7 peanut butter keeps contaminating the MSVC8/Express chocolate. Magproto.c: Don't use implicit int. msvc/config.h: Bump version number. --- magproto.c | 2 +- msvc/GPSBabel-msvc7.sln | 21 + msvc/GPSBabel-msvc7.vcproj | 2447 ++++++++++++++++++++++++++++++++++++ msvc/config.h | 56 +- 4 files changed, 2497 insertions(+), 29 deletions(-) create mode 100644 msvc/GPSBabel-msvc7.sln create mode 100644 msvc/GPSBabel-msvc7.vcproj diff --git a/magproto.c b/magproto.c index e48a9d560..9e9197534 100644 --- a/magproto.c +++ b/magproto.c @@ -721,7 +721,7 @@ static void mag_rd_init_common(const char *portname) { char *ext; - waypoint_read_count = 0; + int waypoint_read_count = 0; if (bs) { bitrate=atoi(bs); diff --git a/msvc/GPSBabel-msvc7.sln b/msvc/GPSBabel-msvc7.sln new file mode 100644 index 000000000..30532e9bc --- /dev/null +++ b/msvc/GPSBabel-msvc7.sln @@ -0,0 +1,21 @@ +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPSBabel", "GPSBabel.vcproj", "{135B8DD1-7606-409F-8395-9C248DDF94A4}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {135B8DD1-7606-409F-8395-9C248DDF94A4}.Debug.ActiveCfg = Debug|Win32 + {135B8DD1-7606-409F-8395-9C248DDF94A4}.Debug.Build.0 = Debug|Win32 + {135B8DD1-7606-409F-8395-9C248DDF94A4}.Release.ActiveCfg = Release|Win32 + {135B8DD1-7606-409F-8395-9C248DDF94A4}.Release.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal diff --git a/msvc/GPSBabel-msvc7.vcproj b/msvc/GPSBabel-msvc7.vcproj new file mode 100644 index 000000000..ba6b6a917 --- /dev/null +++ b/msvc/GPSBabel-msvc7.vcproj @@ -0,0 +1,2447 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/config.h b/msvc/config.h index 6c513d5a0..0d45f4ec6 100644 --- a/msvc/config.h +++ b/msvc/config.h @@ -1,28 +1,28 @@ -#define HAVE_LIBEXPAT 1 -#define __va_copy(ap1, ap2) ((ap1) = (ap2)) - -// This controls the capabilities of our Character Encoding Transformations. -// Undefne for minimal. -// Define to zero for the common UTF-8, ASCII and related sets. -// Define to one for everything we know. - -#undef CET_WANTED - -/* 1 to enable the CSV formats support */ -#undef CSVFMTS_ENABLED - -/* 1 to enable all the filters. */ -#undef FILTERS_ENABLED - -/* 1 to enable Palm PDB support */ -#undef PDBFMTS_ENABLED - -/* 1 to enable shapefile support */ -#undef SHAPELIB_ENABLED - -#define ZLIB_INHIBITED 1 - -/* We really should figure out some way to get this from autoconf into - * a file so that the MSVC build can pick it up - */ -#define VERSION "1.3.1" +#define HAVE_LIBEXPAT 1 +#define __va_copy(ap1, ap2) ((ap1) = (ap2)) + +// This controls the capabilities of our Character Encoding Transformations. +// Undefne for minimal. +// Define to zero for the common UTF-8, ASCII and related sets. +// Define to one for everything we know. + +#undef CET_WANTED + +/* 1 to enable the CSV formats support */ +#undef CSVFMTS_ENABLED + +/* 1 to enable all the filters. */ +#undef FILTERS_ENABLED + +/* 1 to enable Palm PDB support */ +#undef PDBFMTS_ENABLED + +/* 1 to enable shapefile support */ +#undef SHAPELIB_ENABLED + +#define ZLIB_INHIBITED 1 + +/* We really should figure out some way to get this from autoconf into + * a file so that the MSVC build can pick it up + */ +#define VERSION "1.3.2" -- 2.30.2